Make HighContrastInverse a dark variant

Make HighContrastInverse available as the dark variant of HighContrast,
in addition to being a standalone theme. This regularizes our theme
variants, and doesn't hurt.

diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py
index a17f09ee0a74198d40056034c4595d079aa2ba4e..3f08c60e8050425ac43d299217ab1913aa5fa7ab 100644 (file)
--- a/gtk/gen-gtk-gresources-xml.py
+++ b/gtk/gen-gtk-gresources-xml.py
@@ -49,9 +49,10 @@ for f in get_files('theme/Adwaita/assets', '.svg'):
 
 xml += '''
     <file>theme/HighContrast/gtk.css</file>
-    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>
+    <file>theme/HighContrast/gtk-dark.css</file>
+    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-dark.css</file>
     <file>theme/HighContrast/HighContrast.css</file>
-    <file>theme/HighContrast/HighContrast-inverse.css</file>
+    <file>theme/HighContrast/HighContrast-dark.css</file>
 '''
 
 for f in get_files('theme/HighContrast/assets', '.png'):

diff --git a/gtk/theme/HighContrast/HighContrast-dark.scss b/gtk/theme/HighContrast/HighContrast-dark.scss
new file mode 100644 (file)
index 0000000..51c57c0
--- /dev/null
+++ b/gtk/theme/HighContrast/HighContrast-dark.scss
@@ -0,0 +1,13 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+// - if you need to inverse a color function use the @if directive to match for dark $variant
+
+$variant: 'dark';
+
+@import '../Adwaita/colors';
+@import 'colors-hc';
+@import '../Adwaita/colors-public'; // export public colors
+@import '../Adwaita/drawing';
+@import '../Adwaita/common';

diff --git a/gtk/theme/HighContrast/HighContrast-inverse.scss b/gtk/theme/HighContrast/HighContrast-inverse.scss
deleted file mode 100644 (file)
index 51c57c0..0000000
--- a/gtk/theme/HighContrast/HighContrast-inverse.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-// General guidelines:
-// - very unlikely you want to edit something else than _common.scss
-// - keep the number of defined colors to a minimum, use the color blending functions if
-//   you need a subtle shade
-// - if you need to inverse a color function use the @if directive to match for dark $variant
-
-$variant: 'dark';
-
-@import '../Adwaita/colors';
-@import 'colors-hc';
-@import '../Adwaita/colors-public'; // export public colors
-@import '../Adwaita/drawing';
-@import '../Adwaita/common';

diff --git a/gtk/theme/HighContrast/gtk-dark.css b/gtk/theme/HighContrast/gtk-dark.css
new file mode 100644 (file)
index 0000000..5f32a5e
--- /dev/null
+++ b/gtk/theme/HighContrast/gtk-dark.css
@@ -0,0 +1 @@
+@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-dark.css");

diff --git a/gtk/theme/HighContrast/gtk-inverse.css b/gtk/theme/HighContrast/gtk-inverse.css
deleted file mode 100644 (file)
index 6649fc4..0000000
--- a/gtk/theme/HighContrast/gtk-inverse.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-inverse.css");

diff --git a/gtk/theme/HighContrast/meson.build b/gtk/theme/HighContrast/meson.build
index 700bd90b09c89a9806aba6cfddb13b9a8f0492a1..0bc693139266a9ab3d29e5fb662e2df5ec10dcab 100644 (file)
--- a/gtk/theme/HighContrast/meson.build
+++ b/gtk/theme/HighContrast/meson.build
@@ -3,7 +3,7 @@ hc_scss_files = files([
 ])
 
 hc_theme_variants = [
-  'inverse',
+  'dark',
 ]
 
 hc_theme_deps = [